Skip to content
This repository has been archived by the owner on Nov 1, 2024. It is now read-only.

Астрим #96

Merged
merged 47 commits into from
Apr 30, 2024
Merged

Астрим #96

merged 47 commits into from
Apr 30, 2024

Conversation

Vonsant
Copy link
Collaborator

@Vonsant Vonsant commented Apr 30, 2024

About the PR

Why / Balance

How to test

Media

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

dvir001 and others added 30 commits April 15, 2024 02:32
* Add ship ymls

* Add mothership console textures

* Add shipyard ymls

* Updates mothership-computers.yml

* Update meta.json

oops

* Delete Resources/Maps/_NF/Shuttles/ghost.yml

* Update meta.json

* Delete shipyard_science.png

* Delete aiupload_key.png

* Delete Resources/Textures/_NF/Structures/Machines/computers.rsi/computer_science.png

* Delete Resources/Prototypes/_NF/Shipyard/ghost.yml

* Update mothership-computers.yml

* Update spectre.yml
* Storage

* Pod

* Update mothership-computers.yml

* Update mailpod.yml

* Update mailpod.yml

* Update mailpod.yml

* Update computers_shipyard_mothership.yml

* Update mailpod.yml

* Update mailpod.yml
…JoinFix

Update VesselListControl.xaml.cs
Updated Uplink values to be more balanced, with the removal of on-spawn ship guns.
Cove fixed
* 04/28/2024 - SOP's

Added NFSD SOP's as a book, overwritten Space Law spawn in PDA's. Space Law and SOP books are now available in the NFSDTech

* Quick Fix

---------

Co-authored-by: Dvir <[email protected]>
…ageBalance

Expedition Balance Small Update
Fixed the cove so it can't be moved.
* 04/29/2024 - Armory Removal (Empress)

Removed the filled armory from the Empress.

* Update empress.yml

---------

Co-authored-by: Dvir <[email protected]>
* Pirate and Syndiecate Hoverbikes

* tweak

* Update vehicles.yml

* contra component for hoverbikes, syndie flatpack in contravend
FrontierATC and others added 11 commits April 29, 2024 17:31
…Alive

Allow Selling Alive Contraband Prisoners To NFSD
* 04/29/2024 - Removed Hardsuits

Removed hardsuits from Black Market Ships.

* 04/29/2024- Grey Pirate Chest

Sneaking in a new color variant for pirate chests, thanks to Stagnation!

* Fix Suit Storage

* BAH

AAAAAAAAAA

* Ships

* 04/29/2024

FIXED FUCKING FUCK

* Update crates.yml

* Update crates.yml

* Update schooner.yml

* Update menace.yml

* Map

---------

Co-authored-by: Dvir <[email protected]>
Co-authored-by: Dvir <[email protected]>
…rs-14#1309)

* Goblin speech bubble

* Update goblin.yml

* Update Goblin.xml

---------

Co-authored-by: Dvir <[email protected]>
…tended time (new-frontiers-14#1219)

* base

* random lathes and circuit boards

* more machine boards

* cash n vendomats

* made MarkerBasePlaceFree actually work as intended, moved the file to more apropriate folder

* more consistent naming, better icons

* engi items, bureaucracy clutter

* engi and med specific spawners, raw mats

* salvage and a bit of hydroponics

* more

* replaced some static items in dungeons with random spawners

* tweaks

* spoiled food, tweaked spawners, tweaked exped tilesets, new exped template, color palette

* expeds reward is single stack of cash now

* extended expedition timer, tweaked prob values on spawners

* adjustments

* more tweaks

* small fix

* reverted changes to experimental dungeon theme, lowered gun spawn probabilities

* lowered chance to spawn meds

* removed experiment.yml

* fixes

* restored experiment.yml

* test

* weapon crates in expos contain unregistered weapons

* reverted changes to original map files for templates

* reverted changes to base ss14 food spawners

* fix

* added randomized loot to new dungeon templates

* more garbage items

* tweaked snovy labs a bit more

* more circuit boards

* distributed atv and hoverbike spawners across dungeons

* added IFF board to spawners

* shuffle numbers, syndies use unregistered by NT guns

* more fiddeling with numbers

* weapon cases

* missing condition component fix

* shield storage fix

* shuttle guns now stored in weapon cases

* small changes to vendomats

* Remove old packs

* Done

---------

Co-authored-by: Dvir <[email protected]>
Added two new crate spawns to the Uplink valued at 15 and 10 FUCs respectively.

Added a "Lethal Armory Stock" crate spawn including:
- id: WeaponRifleLecter
      amount: 5
    - id: WeaponSubMachineGunWt550
      amount: 4
    - id: WeaponShotgunEnforcer
      amount: 5
    - id: WeaponLaserCarbine
      amount: 4
    - id: WeaponEnergyGun
      amount: 4
    - id: WeaponPistolMk58
      amount: 4
    - id: WeaponRevolverInspector
      amount: 4

and a "Non-lethal Armory Stock" crate spawn including:
    - id: WeaponDisabler
      amount: 5
    - id: WeaponPistolMk58Nonlethal
      amount: 4
    - id: WeaponDisablerSMG
      amount: 5
    - id: WeaponRifleLecterRubber
      amount: 4
    - id: WeaponShotgunEnforcerRubber
      amount: 4
@Vonsant Vonsant merged commit 93ca559 into master Apr 30, 2024
13 checks passed
@Vonsant Vonsant deleted the upstream3004 branch May 4, 2024 03:38
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

9 participants